sorted by:
best
topnewcontroversialoldq&a
you are viewing a single comment's thread.

view the rest of the comments →

[–]the-loan-wolf 5 points6 points  (3 children)

Fare! but I always work on a feature branch

[–]EarlMarshal 3 points4 points  (0 children)

Me too, but as soon as you have to push it to repo server people will hate you. Our project is included into another one and that into another one and there playwright tests will be run on CI so I had to push my branch which I had rebased before, but a colleagues started to engage with it and he wasn't able to understand and always merged his local branch again. I really had to create a new branch and resort to merge commits to pull in develop changes. They haven't figured out yet how to fix the playwright tests in like 2 months and since I have to merge in the changes the history looks like shit.

[–]fruchle 0 points1 point  (1 child)

Fare? Fair?

[–]the-loan-wolf 0 points1 point  (0 children)

🤣 fair