Databases
StackOverflow2013
Postsdbo
POGit: endless merges. I'm tired of them
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POGit: endless merges. I'm tired of them
    primarykey
    data
    text
    <p>Recently I've started working in Git with team of 8 people. We decided that it's a good practice to work separately in each personal branch (someone read about it somewhere). After working in such topology a little while, I've got pissed of how much time takes to get/merge changes from master and push/merge it back. Half of time that I'm spending on issue - takes to merge with someone's changes.</p> <p>I want to have latest changes from master every 2 hours. But each time I have to spend time to merge them into my branch.</p> <p>I assume that git is ok and we have chosen wrong workflow. Ho can we avoid frequent merges and always have latest master checked in ?</p> <p><strong>UPD.</strong></p> <p>As Neil noticed correctly - some of us are working simultaneosly on one piece of code. That we will get merges in other VCS'es - it's true. but not so often as in git !</p> <p>For example: I wanted to rename class in the project. This class is using broadly in project. I've made it in my branch. Ok, I've got each time that i'm pulling from master - merges from my teammate. Then I've decided to finally merge it to master. Another one merge. I've made it. Then my teammate pulls and got another merge. So time what spends on merges in team is litterally wasted. </p> <p>I'm not blaming git. I think there is simply better workflow for this. Now we have decided to refuse using branches and work directly with master hoping that no one will broke our build.</p> <p><strong>UPD. 2</strong></p> <p>Also its often happens that I'm getting merge with code that I've never modified. This is odd, as I have to resolve conflicts on code that I've got no idea about. May be there is also some workarounds avoiding these merges?</p>
    singulars
    1. PO
      singulars
      1. PTAnswer
    1. This table or related slice is empty.
    1. PTQuestion
    1. USIgor Konoplyanko
    1. USIgor Konoplyanko
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PO
      singulars
      1. PTAnswer
    2. PO
      singulars
      1. PTAnswer
    3. PO
      singulars
      1. PTAnswer
    1. VO
      singulars
      1. POGit: endless merges. I'm tired of them
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. POGit: endless merges. I'm tired of them
      1. USGabriele Petrioli
      1. VTFavorite
    3. VO
      singulars
      1. POGit: endless merges. I'm tired of them
      1. This table or related slice is empty.
      1. VTUpMod
    1. COWhat happens during a merge, do you have lots of merge conflicts?
      singulars
      1. POGit: endless merges. I'm tired of them
      1. USLasse Vågsæther Karlsen
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload