switching off conflict information #491

Closed
opened 4 months ago by gerhardbeck · 6 comments

Git very often shows us conflicts, when there are no conflicts as the the merges were tested by our developer.
Actually it is very annoying.
Is is possible to switch the conflict system off?

Git very often shows us conflicts, when there are no conflicts as the the merges were tested by our developer. Actually it is very annoying. Is is possible to switch the conflict system off?
gerhardbeck changed title from switching of conflict information to switching off conflict information 4 months ago
Collaborator

what we could do on gitea's side is to display the "update branch" button even if git indicates a conflict as "try update" whitch will return an error if it realy is the case ...

what we could do on gitea's side is to display the "update branch" button even if git indicates a conflict as "try update" whitch will return an error if it realy is the case ...
Collaborator

this way the "problem" will get minimized to a button klick next to merge button on web - what do you think of it?

this way the "problem" will get minimized to a button klick next to merge button on web - what do you think of it?
fnetX added the
enhancement
gitea-related
labels 4 months ago
rwa commented 1 week ago
Collaborator

@gerhardbeck Is this still an issue for you?

As far as i'm concerned git does mostly pretty well on merging things and only shows conflicts if there are some.
An example where conflicts are shown which you don't expect to be there would be nice. Maybe it's just a small adjustment to your workflow which would avoid these conflicts.

@gerhardbeck Is this still an issue for you? As far as i'm concerned git does mostly pretty well on merging things and only shows conflicts if there are some. An example where conflicts are shown which you don't expect to be there would be nice. Maybe it's just a small adjustment to your workflow which would avoid these conflicts.
Poster

honestly I don't know. we had a massive problem 4 month ago when we needed to remain a module. This renames showed a lot of conflicts, which where no conflicts. they just worked.
but as this renames were done we didn't work on that problem and the issue didn't show up again, so I can't say.

honestly I don't know. we had a massive problem 4 month ago when we needed to remain a module. This renames showed a lot of conflicts, which where no conflicts. they just worked. but as this renames were done we didn't work on that problem and the issue didn't show up again, so I can't say.
rwa commented 1 week ago
Collaborator

usually renaming things is fine with git, if problems occur using the specialized git mv command may help.

I'd close this issue if it's ok for you. I hihgly suspect that this was more of a workflow issue than an actual issue with gitea.

usually renaming things is fine with git, if problems occur using the specialized `git mv` command may help. I'd close this issue if it's ok for you. I hihgly suspect that this was more of a workflow issue than an actual issue with gitea.
gerhardbeck closed this issue 1 week ago
Poster

right now similar problems, but we try to finde the problem. If we can't solve it I just reopen...
Thanks

right now similar problems, but we try to finde the problem. If we can't solve it I just reopen... Thanks
Sign in to join this conversation.
No Milestone
No Assignees
3 Participants
Notifications
Due Date

No due date set.

Dependencies

This issue currently doesn't have any dependencies.

Loading…
There is no content yet.