Home/ Questions/Q 8364707
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-06-09T12:29:11+00:00

Our team recently started using Git. The main workflow we’re doing is simple, (as

  • 0

Our team recently started using Git.

The main workflow we’re doing is simple, (as we’re not yet ninja-trained on more complex commands and workflows with it):

  1. Developer A commits new code (few commits).
  2. Developer A pushes changes to main repository.
  3. Developer B commits, tries to push (gets a message saying he must PULL).
  4. Developer B pulls, then pushes.

After some time, the repository log looks like this:

enter image description here

I would like to avoid this, since it makes the log pretty much unreadable, not to mention in some cases the ‘merging’ that is going on does not change any files (i can’t see any change made by it).

Are we doing something wrong in the way we work with Git? should we do it differently?

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    You’re not doing anything wrong, that’s just Git recording that a change was made to the repository by merging two sets of changes.

    If you use git rebase before pushing, or git pull --rebase when pulling, then the merge commits will not be kept in the history. See http://arjanvandergaag.nl/blog/clarify-git-history-with-merge-commits.html for more.

    • 0