Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for UE4Editor merge resolution workflow #4

Open
mastercoms opened this issue Jul 20, 2020 · 1 comment
Open

Add support for UE4Editor merge resolution workflow #4

mastercoms opened this issue Jul 20, 2020 · 1 comment

Comments

@mastercoms
Copy link
Member

Git repo now configured properly for UE4Editor to detect a conflict and prompt for a resolution. However, we block launches from happening when a merge conflict is encountered. Thus, we should investigate the UE4Editor workflow for this, and confirm everything is working smoothly. It may require creating a custom mergetool for git (to replace the default p4merge.exe in UE4Editor, which isn't found in path).
@mastercoms
Copy link
Member Author

Partially fixed in fc39d27. Still need to unblock launches when a merge conflict is present.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@mastercoms