-
Hi @castower
I was following steps to merge my lab03 to github and encountered a conflict. I'm not too confident if I should click on resolve conflict or if I made an error last week when merging th…
-
### Summary
Same orders with the same name and same delivery date does not add on to one another
Since the order have the same name and same delivery date, perhaps merge them together to make it mor…
-
Hey Scott, lets just put together a plan for this because its starting to get messy. I think because we have been merging eachothers repos, I can no longer revert some of the newer commits, to a pre r…
-
Hi there, I have a thorny problem I could use some pointers on:
I'm trying to convert a collection of 40 multi-repos into a monorepo. My main goals are:
1. Order commits by the original commit t…
-
Trying to understand what the behaviour of `merge-queue` v. `safe-merge-queue` v. `unsafe-merge-queue` is, I turned to are documentation.
However, https://docs.webkit.org/Getting%20Started/Contribu…
-
Thanks a lot for this nice plugin! It makes me *extremely* close to fully automating my daily workflow... however I have used a slightly different merging rule so far and I would like to keep consiste…
-
# 🧱 Description
Branches created for backend implementations are not organized and contain unnecessary ones. It requires to be refactor.
Related to issue #622
Related to pull request #611
#### …
-
Please add a merge force bank restorer
-
Basically when it says there is a conflict and gives you content like this:
-
### Is there an existing issue for this?
- [X] I have searched the existing issues
### Problem description
Can you port Perl script to freecad ifc project for ifcmerge
### Full version info
```…