Question

Commiting in main line

0

Hi, I had merged the code from branch line to main line. I had also did one change in main line, can we commit the same in main line?

asked 2022-04-06

Lavanya R

2 answers

Matteo Timmermans · Answer 1 · 2022-04-06

Hi Lavanya,

Yes committing works the same in the mainline. If you commit now you will commit your changes from the branch AND the changes made directly on the mainline.

Does this answer your question?

Ronald Catersels · Answer 2 · 2022-04-06

Yes no problem. When merging it will apply those changes. You can then do more changes and do all in one commit. It is best practise though to try to seperate commits in case you need to roll back a merge. Because it would role back all the changes.

Regards,

Ronald