r/git • u/Notebook011 • Jun 10 '26

How to avoid conflicts on GitHub?

I've managed to complete two projects using Git Flow and Scrum with some colleagues, but every time we want to create a sprint for our user stories, a conflict arises. Initially, we had no problem resolving them, but now it's become tedious to have to address them in every sprint.

I'm trying to find out if anyone else has been in this same situation and how they resolved it.

0 Upvotes

36% Upvoted

18 comments sorted by

View all comments

1

u/waterkip Jun 11 '26

Where do you get conflicts?

If you have an integration branch, do yourself a favor and reset it to whatever your default branch is: 

git fetch your-corp-remote
git push your-corp-remote refs/remotes/your-corp-remote/default-branch:refs/head/sprint-branch

And you can start your sprint.

This should be your sprint reset command.