Skip to content

Merge conflict #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohanMabille merged 4 commits into from
Dec 3, 2025
Merged

Merge conflict #60

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31972c4
Merge conflicts
SandrineP Oct 30, 2025
2f284f5
small fixes
SandrineP Dec 2, 2025
03c952a
address review comments
SandrineP Dec 3, 2025
687ffb1
small fix
SandrineP Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
small fixes
  • Loading branch information
@SandrineP
SandrineP committed Dec 2, 2025
commit 2f284f51b17dbf3800b344fa52cef10633d3c994
1 change: 1 addition & 0 deletions src/subcommand/merge_subcommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ void perform_fastforward(repository_wrapper& repo, const git_oid target_oid, int
void merge_subcommand::create_merge_commit(
repository_wrapper& repo,
const index_wrapper& index,
std::vector<std::string> m_branches_to_merge,
Comment thread
JohanMabille marked this conversation as resolved.
Outdated
const annotated_commit_list_wrapper& commits_to_merge,
size_t num_commits_to_merge)
{
Expand Down
1 change: 1 addition & 0 deletions src/subcommand/merge_subcommand.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class merge_subcommand
void create_merge_commit(
repository_wrapper& repo,
const index_wrapper& index,
std::vector<std::string> m_branches_to_merge,
Comment thread
JohanMabille marked this conversation as resolved.
Outdated
const annotated_commit_list_wrapper& commits_to_merge,
size_t num_commits_to_merge);

Expand Down
22 changes: 2 additions & 20 deletions src/subcommand/status_subcommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,7 @@ void print_not_tracked(const std::vector<print_entry>& entries_to_print, const s
const size_t first_slash_idx = e.item.find('/');
if (std::string::npos != first_slash_idx)
{
auto directory = e.item.substr(0, first_slash_idx);
auto directory_print = e.item.substr(0, first_slash_idx) + "/";
auto directory = e.item.substr(0, first_slash_idx) + "/";
if (tracked_dir_set.contains(directory))
{
not_tracked_entries_to_print.push_back(e);
Expand All @@ -150,7 +149,7 @@ void print_not_tracked(const std::vector<print_entry>& entries_to_print, const s
{}
else
{
not_tracked_entries_to_print.push_back({e.status, directory_print});
not_tracked_entries_to_print.push_back({e.status, directory});
untracked_dir_set.insert(std::string(directory));
}
}
Expand Down Expand Up @@ -291,21 +290,4 @@ void status_subcommand::run()
// std::cout << std::endl;
// }
// }

if (!sl.has_tobecommited_header() && (sl.has_notstagged_header() || sl.has_untracked_header()))
{
if (sl.has_untracked_header())
{
std::cout << nothingtocommit_untrackedfiles_msg << std::endl;
}
else
{
std::cout << nothingtocommit_msg << std::endl;
}
}

if (!sl.has_notstagged_header() && !sl.has_untracked_header())
{
std::cout << uptodate_msg << std::endl;
}
}