French layout review Aug3 #6661
Conversation
|
@shadrackkibet , @rachelkg unfortunately there are now conflicts in this PR, probably because we just merged PR #6558 and PR #6580. @N-thony As discussed, please resolve the compilation errors in PR #6543 so that we can roll back the conflicts, test and merge. |
I used the following Git commands: $ git merge-base pr/6661-french-layout-review-aug3 master 506bdbd $ git checkout 506bdbd -- dlgOneVariableGraph.resx dlgOneVariableSummarise.resx dlgOneWayFrequencies.resx sdgDataOptions.resx sdgFiltersFromFactor.resx sdgOneVarGraph.resx sdgSummaries.resx ucrAxes.Designer.vb ucrAxes.resx ucrSaveGraph.resx
|
@rachelkg Sorry, I needed to remove some conflicting files, you'll have to make these updates again in a new PR. From this point on, the risk of merge conflicts should be significantly less. I removed the conflicting files from this PR with the git commands below. $ git merge-base pr/6661-french-layout-review-aug3 master $ git checkout 506bdbd -- dlgOneVariableGraph.resx dlgOneVariableSummarise.resx dlgOneWayFrequencies.resx sdgDataOptions.resx sdgFiltersFromFactor.resx sdgOneVarGraph.resx sdgSummaries.resx ucrAxes.Designer.vb ucrAxes.resx ucrSaveGraph.resx |
|
@rdstern @shadrackkibet Please could one of you approve and merge? thanks |
shadrackkibet
added
bug
skip-releasenotes
In this pull request I have redone changes to dialogs that had conflicts and addressed comments about my previous pull request. I will be working on this again Tuesday the 10th, so please merge by then if possible.
Thanks,
Rachel