Jump to content
Toggle sidebar
FreeCAD Documentation
Search
English
Log in
Personal tools
Log in
Index
Overview
Features
Screenshots
Download
FAQ
Forum
Tracker
General usage
User Hub
Manual
Tutorials
Installing
Getting started
Navigation styles
Customizing FreeCAD
Commands list
Workbenches
Workbenches list
Arch
Draft
FEM
Mesh
OpenSCAD
Part
PartDesign
Path
Points
Robot
Sketcher
Spreadsheet
Surface
TechDraw
External workbenches
Python scripting
Powerusers hub
Discovering Python
Python in FreeCAD
Macros
Mesh scripting
Part scripting
Pivy
PySide
Parametric objects
Code examples
Python API
Development
Developers hub
How to contribute
Git repository
Compiling
License details
Organization chart
Startup options
Branding
Translating
Help & Feedback
Forum
Bugs tracker
IRC channel
Facebook
Twitter
Mastodon
Meta
Recent changes
Random page
Links
Tools
What links here
Related changes
Special pages
Printable version
Permanent link
Page information
In other languages
Languages
On this FreeCAD Documentation the language links are at the top of the page across from the article title.
Go to top
.
Contents
move to sidebar
hide
Beginning
1
Résolution des conflits lors d'une fusion
Toggle the table of contents
Toggle the table of contents
Translations
:
Developing FreeCAD with GitKraken/27/fr
Translation unit
Discussion
français
Read
View source
View history
More
Read
View source
View history
From FreeCAD Documentation
Résolution des conflits lors d'une fusion