i have an issue
there 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?