Lets_git_it_started issueshttps://git.ufz.de/ehrhards/lets_git_it_started/-/issues2020-04-29T11:05:49+02:00https://git.ufz.de/ehrhards/lets_git_it_started/-/issues/1i have an issue2020-04-29T11:05:49+02:00Alexander Wachholzi have an issuethere is a `feature_file.txt` in my branch, and you created a `feature_file.txt.origin`... how do we merge them now cleverly?there is a `feature_file.txt` in my branch, and you created a `feature_file.txt.origin`... how do we merge them now cleverly?Sophie EhrhardtSophie Ehrhardt