Here's how to resolve a conflict that occurs during the git merge process when collaborating on a project with a team member.

[MinWook6457]

Let's assume there are master branch, a branch, and b branch.

If branch a sends a pull request to the master branch and master merges the branch, a conflict may occur when branch b pushes. At this time, branch b is working on a feature.

Action tips for branch b

git stash

git stash is a Git command that temporarily saves the current working changes and restores the working directory to a clean state.

In other words, it allows you to store uncommitted changes and apply them later when needed.

git pull origin master

git stash pop

git stash pop applies the most recent stashed changes and removes them from the stash list.

If you go through the above process, the commit time in git staging will match, so there will be no conflict.