MERGING OF A BRANCH INTO MAIN NOT WORKING

0
I made changes to the domain model on an entity by adding an Index and a new attribute, when merging back into Main it does not propagate through to Main
asked
2 answers
0

Made a stupid  Mistake

answered
0

@Juan le Roex: Can you please elaborate on the “stupid mistake”?

 

I experience the same at the moment: 

App with main branch → create branch X → update modules in branch X → commit branch X → switch back to main branch → merge branch X

 

The changes are merged, but there is no indication that modules/file have changed (not marked yellow or green) and the main branch cannot be commited to git as “There are no changes to commit.”.

 

What seems to work: change a file after merge and commit

answered