Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>I seems like you are trying to emulate the old clearcase induced workflow by means of git. This is usually not a good idea. (Even though your team is used to the good old workflow.)</p> <p>If clearcase works fine for you, just stick with clearcase. If you had a good reason to switch to git, use the chance to look at you business workflows and build a suitable git workflow around it.</p> <p>Ask yourself some questions:</p> <ul> <li>What kind of files are you working with? (code, documentation, ...)</li> <li>Why do you need to change the files at all? (new features, bug fixes, ...)</li> <li>Why do different team members need to work on the same files? (Maybe you could improve the assignment of your tasks or the structure of your project?)</li> </ul> <p>Next set up some meaningful branches. Currently it seems like you are doing all your work on one single master branch, but branches in git are extremely lightweight you really should think about developing features in separate branches and do explicit merges.</p> <p>Please don't abuse your CI system to push commits around and enforce automatic merges unless you have a very good reason for this. A "push" usually means, you have finished your work and are ready to share it with your other team members. Your CI system usually cannot decide whether the work is finished or in some buggy experimental state.</p> <p>I would recommend setting up a some branches, give them a good semantic and set up you CI system to check those branches whenever they are updated. - Things like push and merge should always be done explicitly and intentional by a real person. Otherwise strange things will happen, sooner or later.</p> <p>But all of this depends on your specific situation. There is no recipe which works for everyone.</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    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. VO
      singulars
      1. This table or related slice is empty.
    2. VO
      singulars
      1. This table or related slice is empty.
    1. This table or related slice is empty.
 

Querying!

 
Guidance

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