KrisK Posted July 26, 2018 Report Share Posted July 26, 2018 Hey is there a way to force a commit. Why: Our current build pipeline checks in a build unreal editor dll and other stuff when finished building. During the build time stuff get's commited. When we than run: cm ci on certain folders we get. This error: A merge is needed from changeset cs:823@XXX to changeset cs:821@XXXX (the changeset you are currently loading) in order to checkin. The checkin operation cannot continue. It is necessary to solve the conflicts by merging your current workspace contents with the latest contents of the branch you are currently working on. Then, you can retry the checkin operation. Link to comment Share on other sites More sharing options...
psantosl Posted July 26, 2018 Report Share Posted July 26, 2018 You mean skipping the merge??? Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.